update dependencies
Andrew Cantino
2 changed files with 6 additions and 6 deletions
+ 5
- 5
Gemfile.lock
@@ -120,7 +120,7 @@ GEM |
||
| 120 | 120 |
method_source (0.8.1) |
| 121 | 121 |
mime-types (1.23) |
| 122 | 122 |
mini_portile (0.5.1) |
| 123 |
- multi_json (1.7.8) |
|
| 123 |
+ multi_json (1.7.9) |
|
| 124 | 124 |
multi_xml (0.5.5) |
| 125 | 125 |
multipart-post (1.2.0) |
| 126 | 126 |
mysql2 (0.3.13) |
@@ -166,15 +166,15 @@ GEM |
||
| 166 | 166 |
json (~> 1.4) |
| 167 | 167 |
rest-client (1.6.7) |
| 168 | 168 |
mime-types (>= 1.16) |
| 169 |
- rr (1.1.1) |
|
| 169 |
+ rr (1.1.2) |
|
| 170 | 170 |
rspec (2.14.1) |
| 171 | 171 |
rspec-core (~> 2.14.0) |
| 172 | 172 |
rspec-expectations (~> 2.14.0) |
| 173 | 173 |
rspec-mocks (~> 2.14.0) |
| 174 |
- rspec-core (2.14.3) |
|
| 175 |
- rspec-expectations (2.14.0) |
|
| 174 |
+ rspec-core (2.14.5) |
|
| 175 |
+ rspec-expectations (2.14.2) |
|
| 176 | 176 |
diff-lcs (>= 1.1.3, < 2.0) |
| 177 |
- rspec-mocks (2.14.1) |
|
| 177 |
+ rspec-mocks (2.14.3) |
|
| 178 | 178 |
rspec-rails (2.14.0) |
| 179 | 179 |
actionpack (>= 3.0) |
| 180 | 180 |
activesupport (>= 3.0) |
+ 1
- 1
app/controllers/agents_controller.rb
@@ -1,6 +1,6 @@ |
||
| 1 | 1 |
class AgentsController < ApplicationController |
| 2 | 2 |
def index |
| 3 |
- @agents = current_user.agents.preload(:most_recent_event, :most_recent_log).page(params[:page]) |
|
| 3 |
+ @agents = current_user.agents.page(params[:page]) |
|
| 4 | 4 |
|
| 5 | 5 |
respond_to do |format| |
| 6 | 6 |
format.html |